Tweak readme.xml to work on new Fedora.

Makefile: rm broken objects of 'make doc' target.
testo & wintesto: test wfff.

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index a9677d2f37829d5dd7816b7a3b60864632be810f..034fa87dc617758e5d50a2ccf5ffc41d84093cd0 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -134,7 +134,7 @@ dep:
 readme.html: readme.xml 
        java  com.icl.saxon.StyleSheet $< \
        /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl \
-       html.stylesheet="http://www.gpsbabel.org/style3.css" > $@
+       html.stylesheet="http://www.gpsbabel.org/style3.css" > $@ || rm $@
        cp readme.html $(WEB)/readme.xhtml
        tools/mkcapabilities
 

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index bfad8ce213097bd5226806e4b0477e83f39bb728..a904cd61cf3c79478c29edef09b63b1dd931c421 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -312,6 +312,22 @@ DEL %TMPDIR%\topo.mxf %TMPDIR%\tpg.mxf %TMPDIR%\geo.tpg
 @echo.\r
 CALL :COMPARE %TMPDIR%\tpg.mxf %TMPDIR%\topo.mxf\r
 \r
+REM TPO (NG Topo!) file format\r
+REM This is hard to test as the datum conversions create minute\r
+REM inconsistencies in the coordinates. We have four reference files:\r
+REM tpo-sample1.tpo, tpo-sample1.gpx, tpo-sample2.gpx, and\r
+REM tpo-sample2.tpo.  These are used to check the conversion to/from\r
+REM TPO format.\r
+DEL %TMPDIR%\tpo-sample1.gpx %TMPDIR%\tpo-sample2.tpo\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -t -i tpo -f reference\track\tpo-sample1.tpo -o gpx -F %TMPDIR%\tpo-sample1.gpx\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\tpo-sample1.gpx reference\track\tpo-sample1.gpx\r
+REM ${PNAME} -t -i gpx -f reference/track/tpo-sample2.gpx -o tpo -F ${TMPDIR}/tpo-sample2.tpo\r
+REM bincompare ${TMPDIR}/tpo-sample2.tpo reference/track/tpo-sample2.tpo\r
+\r
 REM OZI (OziExplorer 1.1) file format\r
 DEL %TMPDIR%\oz.wpt %TMPDIR%\ozi.wpt\r
 @echo on\r

diff --git a/gpsbabel/readme.xml b/gpsbabel/readme.xml
index 5c85ac399ce770c85a7f8e787d547b31c5393d0b..ee64a47901998e13b14cfd6ad3a621d6e4b932a1 100644 (file)
--- a/gpsbabel/readme.xml
+++ b/gpsbabel/readme.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!DOCTYPE book
-  SYSTEM "/usr/share/sgml/docbook/xml-dtd-4.1.2-1.0-26/docbookx.dtd">
+  SYSTEM "/usr/share/sgml/docbook/xml-dtd-4.1.2-1.0-30/docbookx.dtd">
 
 <book>
    <bookinfo>

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 6030fa548ccf5244f0befdcae0dcfa42c37d561c..3a24e0b5324273f0f4819044b62886f1866a29ef 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -992,4 +992,10 @@ compare ${TMPDIR}/unicsv.gpx reference/unicsv.gpx
 ${PNAME} -i nmea -f reference/track/nmea -o gpx -F ${TMPDIR}/nmea.gpx
 compare ${TMPDIR}/nmea.gpx reference/track/nmea.gpx
 
+#
+# Wfff.
+#
+${PNAME} -i wfff -f reference/wfff.xml -o gpsutil -F ${TMPDIR}/wfff.gpu
+compare ${TMPDIR}/wfff.gpu reference/wfff.gpu
+
 exit 0